[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign ankitasw for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Welcome @clebs!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

Hi @clebs. Thanks for your PR.

I'm waiting for a github.com member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

@richardcase This PR here based on @bryan-cox's: #5720

Changes:

• Rebased the PR to main
• Fixed missing/wrong go modules
• Updated all imports to use the new v1beta2 API, except for conditions which stay on v1beta1
• Adapted all the code to properly use the new types
• Add adapters to use v1beta1.Conditions with v1beta1types
• Manually fix converters for FailureDomains

Current state:

• Code compiles
• Generation fails because of manual conversions required
• Working on linting issues

/ok-to-test

Hm still seeing this: https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/5720/pull-cluster-api-provider-aws-e2e/1990716794330943488#1:build-log.txt%3A1229-1238

Are there some more of these that need updating?

[FAILED] failed to run clusterctl upgrade
  Unexpected error:
      <*errors.fundamental | 0xc0034bc4e0>: 
      current version of clusterctl could only upgrade the core provider to v1beta2 contract version, requested v1beta1
      {
          msg: "current version of clusterctl could only upgrade the core provider to v1beta2 contract version, requested v1beta1",
          stack: [0x3aa4970, 0x3aa39e5, 0x3ac2b64, 0x3bafbd3, 0x3bb49e8, 0x3d9b6f0, 0x86eb93, 0x882abb, 0x4841e1],
      }
  occurred
  In [It] at: /home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/clusterctl/client.go:202 @ 11/18/25 10:24:17.336

Hm still seeing this: https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/5720/pull-cluster-api-provider-aws-e2e/1990716794330943488#1:build-log.txt%3A1229-1238

Are there some more of these that need updating?

[FAILED] failed to run clusterctl upgrade
  Unexpected error:
      <*errors.fundamental | 0xc0034bc4e0>: 
      current version of clusterctl could only upgrade the core provider to v1beta2 contract version, requested v1beta1
      {
          msg: "current version of clusterctl could only upgrade the core provider to v1beta2 contract version, requested v1beta1",
          stack: [0x3aa4970, 0x3aa39e5, 0x3ac2b64, 0x3bafbd3, 0x3bb49e8, 0x3d9b6f0, 0x86eb93, 0x882abb, 0x4841e1],
      }
  occurred
  In [It] at: /home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/clusterctl/client.go:202 @ 11/18/25 10:24:17.336

We still have one place that has a v1beta2 contract (only one left in the codebase):

Was it left intentionally or should it also be v1beta1 @chrischdi ?

Hm still seeing this: prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/5720/pull-cluster-api-provider-aws-e2e/1990716794330943488#1:build-log.txt%3A1229-1238
Are there some more of these that need updating?

[FAILED] failed to run clusterctl upgrade
  Unexpected error:
      <*errors.fundamental | 0xc0034bc4e0>: 
      current version of clusterctl could only upgrade the core provider to v1beta2 contract version, requested v1beta1
      {
          msg: "current version of clusterctl could only upgrade the core provider to v1beta2 contract version, requested v1beta1",
          stack: [0x3aa4970, 0x3aa39e5, 0x3ac2b64, 0x3bafbd3, 0x3bb49e8, 0x3d9b6f0, 0x86eb93, 0x882abb, 0x4841e1],
      }
  occurred
  In [It] at: /home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/clusterctl/client.go:202 @ 11/18/25 10:24:17.336

We still have one place that has a v1beta2 contract (only one left in the codebase):

cluster-api-provider-aws/test/e2e/data/e2e_conf.yaml

Line 129 in c0ef9f4

contract: v1beta2

Was it left intentionally or should it also be v1beta1 @chrischdi ?

This should be kept v1beta2 AFAIK, because CAPA v2.7.1 's API which provides the contract is v1beta2.

This is a "per provider" setting. Not all have to be on the same API versioning as core CAPI.

Also: the job you linked was on the old commit. Not the latest one. (not sure if that had all the required changes to fix it)

/test pull-cluster-api-provider-aws-e2e-clusterclass
/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts

We can ignore pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts

It is permafailing also on periodics: https://storage.googleapis.com/k8s-triage/index.html?text=No%20Control%20Plane%20machines%20came%20into%20existence.%20&job=cluster-api-provider-aws-.*ci-artifacts&xjob=-release-

/test pull-cluster-api-provider-aws-e2e-clusterclass

I agree on the clusterctl one, this still fails already on the still running job: pull-cluster-api-provider-aws-e2e

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-clusterclass
/test pull-cluster-api-provider-aws-e2e-conformance
/test pull-cluster-api-provider-aws-e2e-eks

/test pull-cluster-api-provider-aws-test

/lgtm

Let's see what the tests say.

LGTM label has been added.

New changes are detected. LGTM label has been removed.

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-clusterclass
/test pull-cluster-api-provider-aws-e2e-conformance
/test pull-cluster-api-provider-aws-e2e-eks

/retest

@chrischdi we can wait after the janitor cleans things up, also maybe it helps to start them in small batches (e2e / e2e eks first, then the others)

/test pull-cluster-api-provider-aws-e2e-blocking
/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-clusterclass
/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts

/test pull-cluster-api-provider-aws-e2e-blocking
/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

/test pull-cluster-api-provider-aws-e2e-clusterclass

/test pull-cluster-api-provider-aws-e2e-conformance

@clebs: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.